When resolving the current run, make sure it's also enrollable (#2046)

When resolving the current run, make sure it's also enrollable (#2046) #12515