Not something we want to fix in XO5, I've added it to our roadmap for XO6