Fixed until 3.1.1