Fixing bugs for Pins association