fixed alignment bug in fs -- macros should really be used