Fix queue points
Closes #185, fixes #179