Fixed #439