Mechanics fix