Fixes #1621