Flor Haag lock-fix1934