Fixes #1636