Issue #66,Issue #65,Issue #64,Issue #63,Issue #62,Issue #61 fix