Angelika Monahan lock-fix0454