More Shah proofing (thanks!)