Fixing bug triggered by last patch.