FIX DOUBLE BUTTON BUG