Fixes #1638