Fixing that mechanical’s hole