Fix #461