Fix for change to tabbutton constructor