Fixed only part issues