Button fix pt. 2