Fixed index method calls (#aDZHzHNV)