Fixed problem when using the Motion Plus extension