Black Death Scorpion bug

The Black Death Scorpion companion is bugged in 2 places. 1st is on the lower floor of the Acquisitions Inc. building and 2nd is on the island of the Dragon Turtle in FBI. It seems that if the area where it is standing has another area like the basement or the ocean floor, the companion seems to sink and die so I am thinking that it might be bugged as well at Ras Nsi and Atropal's floors, but of course I haven't tested those 2 other areas since the group won't allow it.. Please include a fix to this issue in Mod 16 or on the next update.,