Hopefully better fix for ASM issue