Fixed #1992