Detect broken shells better