Meridith Hubert lock-fix0335