Fixing pin problem