implemented #108