fixed missing button check