Fixed #1961