Fixed button enabled = false issue