MAGE-6732

Fix for Issue #42 
More info is the commit messages.