fixed button handler
fixed button handlers