Update for xampp compatibility