Merge pull request #4 from csaboka/SLING-7815

Fix for SLING-7815