Fixes #1654