Tenative fix to a bug.