Fixes #1363