implemented #98