Fixed #416

Another way to skin the cat
Preserve Pippin's sanity
Merge pull request #431 from sumobi/issue/416

Fixed #416