Fixed #4032
Update