Implemented #34.