Fixes #1439