Fixes #1320