hotfix patch for UI logic bug