Fixing the issue 44