fix PR #19 (commit ce02bb8) for bug 986221