Fix issues with pin dropping