Fixed #494