Fixed first button bug