end issue fix