- fixes #26