Bug fix about pick up and swap item