fixed fetch bug