Fixed to use my macro instead of builtin