Addressing #96