Trying to fix response codes