fixing of the issue. test not done yet