Fixes #185, but I'm unsure if this is how we want to be fixing it
Merge pull request #190 from astro/issue-185

Fixes #185