RE: Issue #21

This fixes #21

Test passing on 1.9.3, 2.0.0 and 2.1.1