fixes #616