Fix of billing entry directives