Fixes #1645