Would be great to have this fixed one day.