Fix invoice service