Button fix pt. 3