Fixing SQS