this fixes #31