Fixed .buttons issue