fixes #399
fixes #119