(fix) Fix Broken Server Logic
Merge pull request #95 from jgladch/fix/queuelogic

I will try this and see