Fixing STUDIO-5020