Fixed #461