Fix for ASM-398 and ASM-455