Fixes #1411