queue and load bug fix