Hanging issue fixed