Almost restored asm support