One more fix for the same bug.