fixed 111, 711, issue 64