Fix for issue #78

- use one not used macro for all