Fix double-fetch bug