Fixing STUDIO-5110