fixes #600