CR fix, move check for LastFired outside the lock