Fix push button problem