[issue  #167][WIP][fixing same button clicked bug]