Fixed compilation error, final commit