Fixed bug with disabled buttons