Fix for ICC