Fix for 6.0