"Forever locks" bugfix