fixes #128 and fixes #127