One last defect fix for ui