Fix for old versions (i.e. 2.6.0)