repaired some stupid mistakes made by me in 9216b2a