Fix ISupport parser