Fix to number 60
Bug fixes
Bugfixing