Issue8 fixed