fixes #693
fixes #694