Fixes the symptom of a greater bug