Fixed compilation to 1.6