Fixing issue with pin data