Fix for #1143

Fix for #1143
Merge pull request #1148 from acharyarajiv/dev

Fix for #1143