Fix button partial defaulting