Foundation 5.2 compat issue