They have an ECS enabled option that fixes that, at 9.9.9.11