workaround for 2_6_1.