Fixes #1622