Fixed the last type arrays