attempt to add fragment support