Quick hack to get billing working