Bill creation mode fix #2