Temporary fix for UI