final schema script fix