fixes #1638
fixes #1744