Fixed problem with custom buttons.