fixes #26, fixes #25