Fixes #1419