Fixing #480