Still unstable code
Fixed compilation bug