Implemented #52