Fix double fetch issue