fixes #52
fixes #61