Fixes #1429