fixes #26