fix for hang