fixed spec to macros-style;