fix_629680
