Close to fixing billing