Restoring this as this wasn't the complete fix

The complete fix was in head the whole time, i just haven't updated
recently