Fixed problem with disabled buttons