FIX (src): Potential Cowboy 400 error resolved