OnS bug solved