this fixes #23