This should fix the hanging