Support also EC2 correctly