Fix edit bill again (last tentative)