lock-fix2499 (Matthew Hatcher)

Following