Fix on charge preparation to check if we are using an old billing scheme