Fix for the 400 error - DO NOT MERGE