#127, #128 issue resolved!!!