Fixing Randal's bug.