changes done: Fix for bug ASM-1030

Fix for bug ASM-1030