fixes per issue 1