Fixing follows
Adding button disable