Implemented #46