new fixes for invoice