One too many hotfixes tonight