try fix Issue 1928