Implemented #269