Issue #253: final fix to bug? fortunately I've got enough tests that I am "forced" into a proper fix:)