Hotfix

Somes hotfix I done on the current master branch.