Forgot taht from JB_2.6 merge