changes done: Fix for bug ASM-1030