fix initial issue