Implemented #360