fixed #480