Fix #431