Fixes #1292