Fixes #1785
More Fixes #1785