Fixes breakage
Merge pull request #1434 from darkwing/omg-were-allgonnadie

Fixes breakage