fixing bugs for these bullshit pins