Fixed 5.2 build