lock-fix6680