Fixed compilation2