issue fixed. Latest code will be commited.