Issue #69,Issue #68,Issue #67 fix