Okay, this should work much better for fresh machines now