Solomon Stultz lock-fix2881