Pull request for another hotfix

Yay for fixing broken things