Now properly handles caged pets.