Updated to reflect bug #20 fix.