Proper fix for schematics disappearing.  Fixes #992.