Add temp hack to get queue to work. Need to implement an alternative