Possibly make mechfab a little more stable