Fixed #2321