Fix service forEach