Implemented #51