Try to fix back compat.