Some issue fix