Fixed rotation issue and pin being "re-dropped"