Fixed #2253