Move function definition to MACROS section because the signature changed after 0.9.8