Fixes #1608