Fix typebutton class not being returned
Make sure we add the typebutton class