Fix #460