fixed queue issue)