Fixed: XDate was still used.