fixes #58, fixes #59