Fixed cannot build with beta4