Fixed #2349