Grady Mullings lock-fix3347