Fixing >= 5.4 build [ci skip]