Ref #21 - Return reference properly