Completed Bug #74 fix.