See if this fixes UI 1.9 issue.