Fix #2532025