Fix #463