FIX #demodefect