Clue bug fixed! Improve stability