Fix xtap