fixes #525