Fixes #480