fix issue with locked state