Fix #437