Should fix problem with issue2421
Hotfix
Hotfix
Merge pull request #897 from Bars107/bugfixing

Bugfixing