Fix for hang with newer GPU F/W