Bug fix for UI