Fixes #1436