Fixes #26 - I seem to have fixed the problem earlier and didn't know it - now I've got tests though