fixed 2 issues