Fix schema
Merge pull request #1969 from umpirsky/fix/schema-cascade

Fix schema