fix the current stuck issue