Fix for ASM-398 and ASM-455
Merge pull request #1 from AnoopSingh1/master

Fix for ASM-398 and ASM-455