fixed double button issue