Final fix of problem

Back to where we were an hour ago.