Fix problem with support for older versions