Fixing caller to use type