Fixed #3421