Fixed #1980