queue fix some bugs