Temporary fix while reworking scr support