lock-fix1622 (Rosita Enright)

Following