bug fix after fetch