This is on the todo to get fixed at some stage. No ETA.