fixing the issue with another solution