Changed core file to stop connection error from occuring