Fixes #1316