This needs fixed with reasonably high priority.