multiple issues (#125, #126)

fixes #125
fixes #126