fixes #480