fixes #568