Fixes #1309