Fixes #1627