Trying to fix production subscription creation issue