more unlock fixing