Fixing getting hung