fix for IDENTITY-2642
Merge pull request #23 from milindaperera/master

Fix for IDENTITY-2642