lock-fix0456 (Hubert Weathers)

Following