fixing queue problems