Marc: Fixed the format of Invoice!!