Fix for STUD-2903