fix partial issues