Fixes #1253