Fix schema issue