[Button Factory fix]