Implemented #253