case-149486: Fixed problem with fluff