Fixed #2250