Fixes #1517