Fix the fix for Bug#6426 (Bug#7210), avoiding frame garbaging loop.