Fixed #742