fixes #127
fixes #130