Fix issue with CloudWatchLogs