Fixes #1372