Fix #2525