Implemented #59