Fixed onPART