UAR-807 another fix