#33 - Fixing effect macro