Fix button fiasco