Fixed some bugs to handle II data