This aims to fix STUD-2093