fixed queue problem
merged with aron