I think this is now addressed in the current rework...