Quick and dirty fix

Merge Hotfix