Fixing #1, not sure how we didn't notice this before.