Benny Oden lock-fix1675