this fixes #30