Tweaking the button enable logic