Solving minor bug