Add fix for container