addressing issue 130