added Expat detection