second try to fix the hanging issue...