Patching port issue with temporary fix (again) until I can think of a better solution