Fixed a small off by one error with the macros