Fixes #1298