Structure fix