Addressing issue 64