Working to fix issue #1963

Now we should convert each method in function…
Fixed issue #1938
Fixed test case in issue #1938