Compat with 1.10