Fixes #1296