Fixes #1384