WIP -- fixed the bouncing back while unlocking issue