Fixed #1938