More foolproofing!