Addressing issue 124