fixed macros for A1, closes #11