even more sync with 5.0.0