- changed conditions for logging macros