Quick fix before 2.1