fixes #553