Terry girly fix. Fixes #118