#59: polished again