Fixing STUDIO-5345