Set bug fixed, add more control triggers