fix #4469 no. 2