hopefully fix queue