should fix #4277