fixed npr #291