Forgot to add fix for only production