Fixed Motor duping
Fixes #13