Fix mechanic design