Adding compatibility for newer marlin builds.