Hotfixing patch for 2989