The changes in 747f9e49d4333906cb01ec8a779ce9dbd485d5eb fixed #27 but should be reviewed before the release following that.