fixes #22, fixes #58