Fix #3405