implemented #49