Fix dropping and pickup