Fixes #1303