Fixed unlock check