Fixes #1382