Issue1 fixed