Implemented #505