Fix to utilize method versus iterating