Fix: support the button tag too