Fixing dependency.
Fixing function wrappers.