Restore find kpgd_method2 as a fallback.

Also fixes missing 'case' in switch statement.
Merge pull request #178 from awsaba/kpgd_method2_fix

Restore find kpgd_method2 as a fallback.