fixed X api issues