MODE-1712-b: Fix for glitches