#4781: fix