Fix regression, fixes #34, closes #35