fixes #574