fix #3421 (again)