Fixed invoice creation