Fixed again defect 712