Fix lack of knowledge of proper structure