Fixes #1466