Invoice related fix