Fix the problem with EggShell.