Implemented #89