issue 705 #705