fixed issues for Invoice related objects