This should make it work again, finally...