Small fix for RAZ-2329