Marko Lumholtz lock-fix3174