Temporary fix to wrong response format