Fixed default button issue