Implemented #306