Fixes #1609