Fixed issue : #77,#78