Roman fix for issue ##4101
Merge pull request #4107 from Firecage/Bugfixesgalore

Roman fix for issue #4101 Fixed #4101