Fix #2364