non-asm compatibility re-fixed