Fix the hang ups