Fixes #1380