Fixes #1649