Addressing #74