Fixing id issue in the base machine plugin.