need to fix the hanging now