Button click bug fixed