Solving the tricky issue