#23 Fixes for macros (ignore macros)