bug fix #4487