take new hlint suggestion..