Fixed issue8
Fixed issue 7