Fix bug queuing, bug VAS-14