Fix for CID 84830