Fixing wrong response codes