Fixed #2252