Added workaround for IP bind issues