Fixed #9657