adding fix for Issue_695