Bugfix for Marnik