Fix #462