Try to re-add fragment support