Fixed the queuing
Merge branch 'develop'