Fixed #463