Fixed Button event bug