Workaround RIDER-3333