Fix macros
CHANGE HERE tag added