Bugfix: oops, wrong variable altered.  reverts and fixes bug in last
commit.