Fixed compilation vs 8.1