Fixes #1420