I can wait until the fixes though