Fixed a problem with 2 buttons with conflicting names