schema fixed