Fix for the strange 400 error. DO NOT MERGE - WILL BREAK EVERYTHING ELSE