Merge pull request #535 from marcin-krolik/kromar-fix-533

Fix for issue#533