Fixes #1516