Update |CURRENT| sustitution for 2.6 fixes #357