Merge pull request #102 from maartenc/IVY-1649

Fix for IVY-1649 and IVY-1650