Fixing queue issue