Implemented #53