fixed two subscript issue