this fixes #17