Fixes #1338