Don't complete item unless dequeued
Fix item indexing