fix hanging