queue bugs fixed