implemented #47