Bring inline with ASM version