Fixes #1447