fixes #119
fixes #120