3.1 hotfixed