Fix #478