Fixes #1450