Fixed #9834669255406