Fix critical KeyError in moveback_queue bug

close #30