fixes #60, fixes #61