issue91: take into account PR remarks