Fix service making multiple calls #60