fixed issues 68294 and 67715