Fixed handling of subscripts