Fixes #1620