[FIX] RT-2001 (work in progress)