Merge and rescue ex correctly
Merge pull request #4 from Meatballs1/psh_fix

Merge and rescue ex correctly