Fixes #1252