this fixes #27