Fix for ip allocation issue