Fixed #2420