Elvia Clausen lock-fix2936