fix 6.0 compatibility