Fix compatibility break
Fix compatibility break