Fixed #1942