Should fix buttons no updating