fixed 6.0 compile