Solving introduced bug