Fixed bug in onClick with limited commits