fixes #569