working around scr issue without downgrade
adapted to DLC #23