Fixing empty models