Fix driver function container
Merge pull request #743 from nicolas-f/fix/driver_function

Fix driver function container