fix to work in 5.2.9