fixed buttons, it work this time