Fixes #1661