Fix compat issue