Hassan Steger lock-fix6680