Implemented #243