Bugfix about first device lock