Fix #430