fix #4059 (2)