Fixed disabling of buttons