this fixes #28