This problem has been fixed in the upcoming v6.26/00 (and still needs to be back ported in time for v6.24/08)