Fixes #1610