Added explicit `[]` where necessary