Implemented #474