Adjusted code for change in 5.5.8