Fixed lost onClickListener in fillUp