fixed the issue 679