Fixes #1410