fixes #655