Fixed the support for a button data