Thanks for that Jamie, I've added the Moodle tracker link to the feature request, so when we start on 2.7 we can see if the Moodle fix is sufficient or whether we want to extend it :-)