Fixes #1669