Viewstate fix