I think this fixes #185 and #186

Typo, #186, not #184.