Fix for ALOY-245
Merge pull request #400 from skypanther/ALOY-245c

Fix for ALOY-245