this fixes #25