Fixes #1672