Fixed issue with "to" macros.