Fixes #1412