adding macros
try to introduce compiler workaround