Marty Brehm lock-fix1205