this fixes #35