Fixed dreadful queue issue