We need the version check here as well for bw comp