fixed coding fails in the last 2 commits