Fix for cloudwatch monitoring