Manager $driver mapping bugfix