Fix for STUD-1311