Fix queue problem