Mathew Hatmaker lock-fix3350