Important fix for the slower EPP connections