Fixed fetch bug