commit #52 by csg