BZ-1065524: Fixing