Fixed #1962