Fix #482