Fixed that all correct checks were after lock.