Fix for the DiploBug