fixed issues created in prior merge