fix #3930 again