Fixes #1438