fixes #681