Fix #480