quick fix for release 2.5.8