Fixes #1675