Fix not found case