Fixed #2340