Fix issue 4,7,10