closing last 2.0 issue related to issue #77