Fix #464