fix fetch issue