Fix struts maybe?