Improved bad egg detection