fix queue macros