Fix stub creation