schema implementation fix