Embperl handler added
Crappy rivet detection