fixed default queue handling -- closes #38