Bug fix - store the wrapped functions. #64