TDD'd #86

Fixes #86