(and do the same for the other functions where only the Subscript case is currently handled)