Fixed #2251