Attempt to fix duplicated buttons