Fixing Pasha's bug.