Temp fix for Pin Lengths