Ninja fixing actuator issue.
Fixing issue #337 and #317 (hopefully)