Implemented #58