bug on pickup and return places