Implemented #654