#31 adopt @dubrsl advise