r22914: - Fixes bug 4599. A missing <code>if</code> statement forced subseqeuent