fix before 24.04.2013